home *** CD-ROM | disk | FTP | other *** search
- diff -Nru cutils-std/lib/Makefile cutils/lib/Makefile
- --- cutils-std/lib/Makefile Sat Jun 29 18:37:27 1996
- +++ cutils/lib/Makefile Sat Jun 29 19:11:12 1996
- @@ -1,7 +1,7 @@
- # $Id: Makefile,v 1.12 1996/06/29 16:37:27 sandro Exp $
-
- LIB= cutils
- -SRCS= hash.c version.c pattern.c
- +SRCS= hash.c version.c pattern.c err.c
-
- CFLAGS+=-I.
-
- diff -Nru cutils-std/lib/err.c cutils/lib/err.c
- --- cutils-std/lib/err.c Thu Jan 1 01:00:00 1970
- +++ cutils/lib/err.c Sat Jun 29 19:11:12 1996
- @@ -0,0 +1,216 @@
- +/*-
- + * Copyright (c) 1993
- + * The Regents of the University of California. All rights reserved.
- + *
- + * Redistribution and use in source and binary forms, with or without
- + * modification, are permitted provided that the following conditions
- + * are met:
- + * 1. Redistributions of source code must retain the above copyright
- + * notice, this list of conditions and the following disclaimer.
- + * 2. Redistributions in binary form must reproduce the above copyright
- + * notice, this list of conditions and the following disclaimer in the
- + * documentation and/or other materials provided with the distribution.
- + * 3. All advertising materials mentioning features or use of this software
- + * must display the following acknowledgement:
- + * This product includes software developed by the University of
- + * California, Berkeley and its contributors.
- + * 4. Neither the name of the University nor the names of its contributors
- + * may be used to endorse or promote products derived from this software
- + * without specific prior written permission.
- + *
- + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- + * SUCH DAMAGE.
- + */
- +
- +#if defined(LIBC_SCCS) && !defined(lint)
- +static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
- +#endif /* LIBC_SCCS and not lint */
- +
- +#include <err.h>
- +#include <errno.h>
- +#include <stdio.h>
- +#include <stdlib.h>
- +#include <string.h>
- +
- +#ifdef __STDC__
- +#include <stdarg.h>
- +#else
- +#include <varargs.h>
- +#endif
- +
- +extern char *__progname; /* Program name, from crt0. */
- +
- +static FILE *err_file; /* file to use for error output */
- +static void (*err_exit)(int);
- +
- +void
- +err_set_file(void *fp)
- +{
- + if (fp)
- + err_file = fp;
- + else
- + err_file = stderr;
- +}
- +
- +void
- +err_set_exit(void (*ef)(int))
- +{
- + err_exit = ef;
- +}
- +
- +__dead void
- +#ifdef __STDC__
- +err(int eval, const char *fmt, ...)
- +#else
- +err(eval, fmt, va_alist)
- + int eval;
- + const char *fmt;
- + va_dcl
- +#endif
- +{
- + va_list ap;
- +#if __STDC__
- + va_start(ap, fmt);
- +#else
- + va_start(ap);
- +#endif
- + verr(eval, fmt, ap);
- + va_end(ap);
- +}
- +
- +__dead void
- +verr(eval, fmt, ap)
- + int eval;
- + const char *fmt;
- + va_list ap;
- +{
- + int sverrno;
- +
- + sverrno = errno;
- + if (! err_file)
- + err_set_file((FILE *)0);
- + (void)fprintf(err_file, "%s: ", __progname);
- + if (fmt != NULL) {
- + (void)vfprintf(err_file, fmt, ap);
- + (void)fprintf(err_file, ": ");
- + }
- + (void)fprintf(err_file, "%s\n", strerror(sverrno));
- + if(err_exit)
- + err_exit(eval);
- + exit(eval);
- +}
- +
- +__dead void
- +#if __STDC__
- +errx(int eval, const char *fmt, ...)
- +#else
- +errx(eval, fmt, va_alist)
- + int eval;
- + const char *fmt;
- + va_dcl
- +#endif
- +{
- + va_list ap;
- +#if __STDC__
- + va_start(ap, fmt);
- +#else
- + va_start(ap);
- +#endif
- + verrx(eval, fmt, ap);
- + va_end(ap);
- +}
- +
- +__dead void
- +verrx(eval, fmt, ap)
- + int eval;
- + const char *fmt;
- + va_list ap;
- +{
- + if (! err_file)
- + err_set_file((FILE *)0);
- + (void)fprintf(err_file, "%s: ", __progname);
- + if (fmt != NULL)
- + (void)vfprintf(err_file, fmt, ap);
- + (void)fprintf(err_file, "\n");
- + if (err_exit)
- + err_exit(eval);
- + exit(eval);
- +}
- +
- +void
- +#if __STDC__
- +warn(const char *fmt, ...)
- +#else
- +warn(fmt, va_alist)
- + const char *fmt;
- + va_dcl
- +#endif
- +{
- + va_list ap;
- +#if __STDC__
- + va_start(ap, fmt);
- +#else
- + va_start(ap);
- +#endif
- + vwarn(fmt, ap);
- + va_end(ap);
- +}
- +
- +void
- +vwarn(fmt, ap)
- + const char *fmt;
- + va_list ap;
- +{
- + int sverrno;
- +
- + sverrno = errno;
- + if (! err_file)
- + err_set_file((FILE *)0);
- + (void)fprintf(err_file, "%s: ", __progname);
- + if (fmt != NULL) {
- + (void)vfprintf(err_file, fmt, ap);
- + (void)fprintf(err_file, ": ");
- + }
- + (void)fprintf(err_file, "%s\n", strerror(sverrno));
- +}
- +
- +void
- +#ifdef __STDC__
- +warnx(const char *fmt, ...)
- +#else
- +warnx(fmt, va_alist)
- + const char *fmt;
- + va_dcl
- +#endif
- +{
- + va_list ap;
- +#ifdef __STDC__
- + va_start(ap, fmt);
- +#else
- + va_start(ap);
- +#endif
- + vwarnx(fmt, ap);
- + va_end(ap);
- +}
- +
- +void
- +vwarnx(fmt, ap)
- + const char *fmt;
- + va_list ap;
- +{
- + if (! err_file)
- + err_set_file((FILE *)0);
- + (void)fprintf(err_file, "%s: ", __progname);
- + if (fmt != NULL)
- + (void)vfprintf(err_file, fmt, ap);
- + (void)fprintf(err_file, "\n");
- +}
- diff -Nru cutils-std/lib/err.h cutils/lib/err.h
- --- cutils-std/lib/err.h Thu Jan 1 01:00:00 1970
- +++ cutils/lib/err.h Sat Jun 29 19:11:12 1996
- @@ -0,0 +1,85 @@
- +/*-
- + * Copyright (c) 1993
- + * The Regents of the University of California. All rights reserved.
- + *
- + * Redistribution and use in source and binary forms, with or without
- + * modification, are permitted provided that the following conditions
- + * are met:
- + * 1. Redistributions of source code must retain the above copyright
- + * notice, this list of conditions and the following disclaimer.
- + * 2. Redistributions in binary form must reproduce the above copyright
- + * notice, this list of conditions and the following disclaimer in the
- + * documentation and/or other materials provided with the distribution.
- + * 3. All advertising materials mentioning features or use of this software
- + * must display the following acknowledgement:
- + * This product includes software developed by the University of
- + * California, Berkeley and its contributors.
- + * 4. Neither the name of the University nor the names of its contributors
- + * may be used to endorse or promote products derived from this software
- + * without specific prior written permission.
- + *
- + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- + * SUCH DAMAGE.
- + *
- + * @(#)err.h 8.1 (Berkeley) 6/2/93
- + */
- +
- +#ifndef _ERR_H_
- +#define _ERR_H_
- +
- +/*
- + * Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two
- + * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
- + * of them here we may collide with the utility's includes. It's unreasonable
- + * for utilities to have to include one of them to include err.h, so we get
- + * _BSD_VA_LIST_ from <machine/ansi.h> and use it.
- + */
- +
- +#if 0
- +#include <machine/ansi.h>
- +#include <sys/cdefs.h>
- +#endif
- +
- +#include <stdarg.h>
- +
- +#ifndef __dead
- +#define __dead
- +#define __dead2
- +#endif
- +
- +#ifndef __P
- +#define __P(p) p
- +#endif
- +
- +#ifndef _BSD_VA_LIST_
- +#define _BSD_VA_LIST_ va_list
- +#endif
- +
- +#ifndef __BEGIN_DECLS
- +#define __BEGIN_DECLS
- +#define __END_DECLS
- +#endif
- +
- +__BEGIN_DECLS
- +__dead void err __P((int, const char *, ...)) __dead2;
- +__dead void verr __P((int, const char *, _BSD_VA_LIST_)) __dead2;
- +__dead void errx __P((int, const char *, ...)) __dead2;
- +__dead void verrx __P((int, const char *, _BSD_VA_LIST_)) __dead2;
- +void warn __P((const char *, ...));
- +void vwarn __P((const char *, _BSD_VA_LIST_));
- +void warnx __P((const char *, ...));
- +void vwarnx __P((const char *, _BSD_VA_LIST_));
- +void err_set_file __P((void *));
- +void err_set_exit __P((void (*)__P((int))));
- +__END_DECLS
- +
- +#endif /* !_ERR_H_ */
-